Cleaned issues