Removed Razor1 and Reference Fix Up to Razor2