Removed dead code and updated comments
Adjusted includes and rebuilt documentation