Cleanup : removed unused functions.