Minor changes
Switching to supersize library
Remove unused