Cleanup
Remove superfluous class