Fixing some cruft