Feature/svendk 171 233 222

Remove it, if its not needed.