Final value schema cleanup - removing unused/tested code