cleaned up unused functions