Removed all unused functions