Update deps
Remove unneeded code and workarounds