Removed TODO placeholders