Clean mock [WIP]

by Johny vino™