Remove unused bits and some updates

Also update Janus submodules if exists