Removed various TODO statements.