Removed PITA TODO