Project Aware clean up Tenerife

Project Aware clean up Tenerife