Clean up views for beta release