Clean up aws tweaks