Remove old artifacts
Make first and last on collection into properties instead of functions