Remove unused mokeypatching, add api modules