Removing old code; Goal check.