few style fixes and removed files that aren't being used