[Bollocks-in-progress] Clean up