Unused code
A few fixes