+ Removed hql comments
+ totaly removed hql queries
+ fixed warnings