Removing some XML methods and a bit of cleanup.