Cleanup: Boilerplate stripped to basics