Removed extraneous features