Removing tight dependencies