#430 - Remove extraneous definitions