Removed "defined" statement at the top of some classes.