More tuning to the doc blocks, and removed method that will probably not get used.