Removed the test pages and removed some unused imports.