Removed unnecessary junk