Remove ugly extending