Removed no longer used classses and ran style cop