Quick pass at removing unnecessary compatibility code