Improved lab isolation, removed obsolete files.