Updating notes and cleaning up dead code