Cleaned up lims2db pull request from @mayabrandi