Update jb branch with some cleaning magic