Clean up & remove unneeded functionality.