clean debugs and obsolete code