Removed final TODO