Cleanup, unused stuff removed.