Build Path cleanup