remove handlers from package
rename to fix bug