Semantic visitor added 
removal of unused classes