Removed unused packages and classes