Cleanup obsolete stuff & use feeds