removed templates dir
misc cleanup