Removing forced dependencies, some issues taking too long to debug