general cleanup, remove cache references and mozeu code