Fix redundant definitions