Removed unused funcs