Removing old command parser