removed files after merging with Connor's branch.