removed and paired down everything