Removed Unnecessary things