Removed the unuseful pieces of code