Removed innecesary code