Remove cruft from application, pass 1