cleaned up classes (@supress serial / unused imports / unused fields)