Clean a little bit up and deleted unnecessary as well