Removed extraneous calls and defines