Remove unecessary definitions