Got rid of unused functions
just in case