Removed TODO-comment about validation as it is implemented now