Address: remove redundant comments
Address: remove circular dependency fix

This is no longer a problem.