cleaned up old code