cleaned up data managers