Removed excessive logging, fixes