Prototype/front end cleanup