Bug fixed, introducing CoreException, removing unused files