Cleanup
Removed mock module