Removed dependencies on contacts