Removing testing code... again