Cleanup on aisle API. This won't address structural changes but instead is intended to start cleanup so we can get our issues cleared out.