Removed handler return values