Pre-deploy cleanup
Deploy #7 (20140416)