Removing wrong conditional in api
Removing unused requires