remove unused helper files
add some error messages