* Removed Razor1 and cleanup