Cleanup (removed unused module)