Remove debug
Move cloudwatch stuff out