Remove unused code
Working on package