#359 - marking Now and Go Obsolete
#359 - refactoring and cleaning up touched files