Removed warnings due to unused imports