Consolidating further + removing unused functionality...