removed unused/obsolete code