cleanup
add apex command