cleaned up associations