fixed according to the latest tutorial
remove unneccesary stuff