Tweaked some messages and removed useless stuff