Removed testing codes because they didn't work properly, and aarsta got things working anyway.