MISC - Clean up codes