removed lot of crud