revision 1 and 2
cleanup controllers