cleanup old code, as it's not working