Cleanup some old code
Updated change log