More cleanup

stuff