Fixes to remove dependencies