Removed remaining TODO!s