files and module have been cleaned up with extraneous functions and data files removed