clean up

Based on new qooxdoo decl cleaned up some code