Cleaned up TODO to be only in milker