Removed unused stuff in the compat module