cleaned up daves mess