clean unused functions
Cleanup