Removed Unecessary Stuff