Removed testing parts and fixed some log text.