Code cleanup - removing unused functions.