Started Cleanup of media queries