added error/warning messages
removed unused files