added option for remove old on store all and small cleanups