cleaning up old code