Removed Javaisms for Soaps