Removed two unused functions