Remove cruft
Fix two stupid bugs