removed the pieces of code that are not needed anymore