Deleted a load of cruft that wasn't helpful for demoing.