Remove unclean/non-functional code