removed unused enum's
cleanup