Cleaned up old unused functions