Minimize functionality
Remove extra class