removed unnecessary parts of the code