More cleanup and moving to Teacup