cleaning up some leftover function params; invalid parent calls