Keeping stuff up to date

Minor changes to keep classes in synch with other repos, plus removed some unecessary code.