added stats
removed obsolete code