Enhanced error msgs. Removed useless files.