Mostly dead code deletion. Also fixed hard-coded version String