Step Refactoring:
 - Remove @Mike tags