removed debugs; fixed layout; added with clause for deprecated rule