Code cleanup

Remove redundent #if defs from code