removed unnecessary parts