Further removal of stuff that will be moved to the C implementation