Removed redundant demo classes from themed demos.