Updated to newest enaml
cleanup