remove warnings (still 6 to go...)