Removed more target specific conditionals from the main codebase