Add some more documentation and remove two functions