Removed all testing stuff