Cleaning up and adding read until valid profile statements