Added remove commands and impl test clean up class.