Continuing script cleanup