get rid of not working defines
DROP