Front end clean up