Removed the bad shell implementation