Removing extraneous Class