upgrade to 2.5
renove package doc blocks
cs