removed files I thought I had removed previously, edited second post