removing refactored old files
minor log improvements