Remove silly implementation