Cleanup
Some controller skeletons.