Clean up of code in progress...