Shell clean up