Removed deprecated stuff, prepared material for next day.