Removed Useless Class