More cleanup and auto script class registration.