Cleaned up old scheme code