remove play handler
optimize handlers