#297 Remove API handlers