More cleanup

eh.