Removed useless imports and uncommented invoke