Cleanup

Removed mock module