Removed extraneous building code