Remove unnessasary includes and change the title