Clean up in shells' code