Removed remaining needless code related to handle()