Remove unused code & fix version