Final Project Cleanup - For WebApp