Updated docblocks, and removed an unused method