remove extends + simplify