Small fixes and removing some cruft