Obsolete code removed. Fixed #23