Removed some testing stuff :-)