TODO still valid? Does it belong in the Javadoc?