Fixed annoying compilation error warnings by removing useless imports/unused code