Cleaned unused functions