Pre-cleaned code

Code is ready for cleanup