Additional cleanup of unused methods