Remove the base class Command and Event (Branch it before that so we have a working pord version) #33