cleaned up propagate some more

deleted some dated lines of code and changed some structure for
readability