Removal of some bad code. Put in some notes about how to fix issues, along with reminders that things are broken.