Removing major TODO