Old code gone
More old code gone
Small improvements