cleaned up building manager