More cleanup

Fixes other shit