More 4.4 updates + some cleaning