Cleanup, remove EC2 tools