Cleaning up object dependencies