Removing old compatability stuff