Removed aws.json and add a main clean up