Cleaned up the scripts, since some of the variables are now in the
parent classes