Update DB Structure & remove rk modules