Cleaned up empty choice list code