Removed warnings and todos