Deleted a couple of things that were getting nowhere
Simplify