cleaning commented code on castle facility