Removed useless class
some fixes