Removed Unecessary Code