Removing some old/revised code