Remove unused functions
Fix pause issue
Fix pause issue