clean up + finish controllers
Clean up cont.