Correct functions names
remove old file