update to pages and cleanup