Removed unused class and package