Fixes

misc coding styles remove old stuff etc