Update some functions and remove some broken functionality