Removing old, unused function