Cleanup + an empty test controller for experimenting