clean up based on Bobby comments