Remove unuseful category, add some method