Removed unnec stuff

Removed stuff that won't happen in the first iteration