Cleaning

Removing functions that’s no longer needed.