implement cleanup and change package to Sb features