Removed non-necessary classes