Commented not used functions
Bug fixes with consol