cleaning up references

renaming or removing functions left over from previous project