Clean up obsolete info, fix includes