Remove cd functionality from master (at this time)