Fixed Debug & removed