Removed  some unnecessary imports and an @Override