Removed ApiExecution + some cleanup