Removed rudundant testing stuff