removed unsafe case. removed useless imports