Re #626 - Removed warnings/todo's