Fixed some checkstyle and removed unused attributes