Remove early hacks.. no longer needed