Removed shell stuff