Removed unused functions