cleanup and comments, removed some unused headers