spacing fix
fixes template calls
removal of some unused stuff.... for now