Some clean up on unused functions