Remove unused imports / use final when possible