Remove ugly do nothing hack