Optimize extends
Remove debug