Removed some todo's