[misc] Do it correct... :-(
[misc] and delete