cleaning up of un-needed definitions, and also something else