Cleaned up debugging codes