Removed some logger and added usability stuff.