Remove database name so we can run the script on any database
Cluster hierarchy for the infoscreens (issue #3)