Remove DWB and other tweaks
Update janus