removed empty files and unused handlers