removing redundant defines