Removed some includes and added some comments