Remove @Override from more methods