packages cleanup
code cleanup