Remove CommandFactory. Move code into Command