Removing old functions that no longer serve any purpose