Removed unused class and important statement