cleanup entry point
Matthias' latest and greatest