Update collection. Remove some methods. Cleanup