Remove Auxilliary Defines

Some bmpl defines do not contain stuff that the user
should change, we move them up in the define (.def) file.