(refactor) Remove old code
(refactor)[Mock] Begin refactor, not working at all