Removed todo's that could easely be implemented by addons.