fix lib references and remove unused files
fix lib references and remove unused files