Remove stupid hack