Started removing statements and replacing them with proper expression alternatives.