removed some vintage code