More cleanup
appcode cleanup