Removed useless imports
Code less dumb