Removed unused code/package