Cleaning up duplicate class inside SASELibrary