Trimming some old/redundant code....