Minor style tweeks
Removed dead file