simplified controllers
cleanup
renamed removing temp suffix