cleanup and adding shell for future