Cleaned from debugging