Fixed issue in Command Base and deleted unused files