vkcell cleanup and fixes