Remove unnecessary stuff and add empty rechits collection