Removed unused package and classes