Make most of the things work
Unneeded code