Add a version flag
Kill unused code